Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <[email protected]>
Tue, 12 Oct 2010 18:49:27 +0000 (20:49 +0200)
committerWolfgang Denk <[email protected]>
Tue, 12 Oct 2010 18:49:27 +0000 (20:49 +0200)

Trivial merge